From ff73d052c72fa0e09806f4c7f5e67d883260f030 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 15 Jul 2003 16:36:20 +0000 Subject: [PATCH] correct several minor language violations. From Bruce Thompson and myself... --- gpsbabel/garmin.c | 2 +- gpsbabel/gpilots.c | 20 ++++++++++---------- gpsbabel/magproto.c | 2 +- gpsbabel/mapsend.c | 4 ++-- gpsbabel/quovadis.c | 15 ++++++++------- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index 9442d8a9b..50f0b3c55 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -88,7 +88,7 @@ waypt_read(void) * all the cases here. Yes, libjeeps should probably * do this and not us... */ - if ((way[i]->alt == (float) (1<<31)) || + if ((way[i]->alt == (float) (1U<<31)) || (way[i]->alt == INT_MAX) || (way[i]->alt == 1.0e25) ) { diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c index e84ea4f1b..deeef5281 100644 --- a/gpsbabel/gpilots.c +++ b/gpsbabel/gpilots.c @@ -43,11 +43,11 @@ Semicircle_Type; typedef struct { - unsigned char ident[6]; /* identifier */ + char ident[6]; /* identifier */ unsigned char lat[4]; /* position */ unsigned char lon[4]; /* position */ unsigned char unused[4]; /* should be set to zero */ - unsigned char cmnt[40]; /* comment */ + char cmnt[40]; /* comment */ unsigned char smbl; /* symbol id */ unsigned char dspl; /* display option */ } D103_Wpt_Type; @@ -103,7 +103,7 @@ struct record #if LATER Custom_Rte_Hdr_Type CustRteHdr; #endif - }; + } wpt; }; @@ -251,14 +251,14 @@ data_read(void) * G103Type */ case 4: - wpt_tmp->shortname = xstrndupt(rec->d103.cmnt, sizeof(rec->d103.ident)); - wpt_tmp->description = xstrndupt(rec->d103.cmnt, sizeof(rec->d103.cmnt)); + wpt_tmp->shortname = xstrndupt(rec->wpt.d103.cmnt, sizeof(rec->wpt.d103.ident)); + wpt_tmp->description = xstrndupt(rec->wpt.d103.cmnt, sizeof(rec->wpt.d103.cmnt)); /* This is odd. This is a Palm DB file, * yet the data appears to be little endian, * not appropriate the the actual Palm. */ - lon = le_read32(&rec->d103.lon); - lat = le_read32(&rec->d103.lat); + lon = le_read32(&rec->wpt.d103.lon); + lat = le_read32(&rec->wpt.d103.lat); wpt_tmp->position.longitude.degrees = lon / 2147483648.0 * 180.0; wpt_tmp->position.latitude.degrees = lat / 2147483648.0 * 180.0; waypt_add(wpt_tmp); @@ -269,9 +269,9 @@ data_read(void) case 101: track_head = route_head_alloc(); route_add_head(track_head); - track_head->rte_name = xstrndup(rec->CustTrkHdr.name, sizeof(rec->CustTrkHdr.name)); - sz = be_read32(&rec->CustTrkHdr.number); - tp = (Custom_Trk_Point_Type *) ((char *) pdb_rec->data + sizeof(rec->CustTrkHdr)); + track_head->rte_name = xstrndup(rec->wpt.CustTrkHdr.name, sizeof(rec->wpt.CustTrkHdr.name)); + sz = be_read32(&rec->wpt.CustTrkHdr.number); + tp = (Custom_Trk_Point_Type *) ((char *) pdb_rec->data + sizeof(rec->wpt.CustTrkHdr)); /* FIXME: This is incomplete and probably wrong */ while (sz--) { wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c index 0b0490132..c23ea0167 100644 --- a/gpsbabel/magproto.c +++ b/gpsbabel/magproto.c @@ -1304,7 +1304,7 @@ mag_route_trl(const route_head * rte) } static void -mag_route_hdr() +mag_route_hdr(const route_head *rh) { } diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c index f0dba1a56..65691bec2 100644 --- a/gpsbabel/mapsend.c +++ b/gpsbabel/mapsend.c @@ -152,7 +152,7 @@ size_t my_fwrite4(int *ptr, FILE *stream) { unsigned char cbuf[4]; - unsigned char *cptr = (char *) ptr; + unsigned char *cptr = (unsigned char *) ptr; if (!endianness_tested) { test_endianness(); @@ -474,7 +474,7 @@ mapsend_route_hdr(const route_head *rte) } static void -mapsend_noop() +mapsend_noop(const route_head *wp) { /* no-op */ } diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c index 669786ced..12a9a6a7b 100644 --- a/gpsbabel/quovadis.c +++ b/gpsbabel/quovadis.c @@ -27,8 +27,8 @@ static const char *out_fname; struct pdb *opdb; static int ct; -static char* rec_ptr = NULL; -static char* current_rec = NULL; +static ubyte* rec_ptr = NULL; +static ubyte* current_rec = NULL; static int rec_index = 0; static char *dbname = NULL; @@ -72,10 +72,10 @@ static int wpt_to_icon(geocache_type type) { } return QUESTION_ICON; } - +#if 0 static void -docopy(char* dest, - const char* src, +docopy(ubyte* dest, + const ubyte* src, const int size) { int i; @@ -83,6 +83,7 @@ docopy(char* dest, dest[i] = src[i]; } } +#endif static void rd_init(const char *fname, const char *args) @@ -173,7 +174,7 @@ quovadis_writewpt(waypoint *wpt) int i; if (current_rec == NULL) { - char dummy = 0; + ubyte dummy = 0; struct pdb_record *pdb_rec; pdb_rec = new_Record(0, 0, ct++, 1, &dummy); if (pdb_rec == NULL) { @@ -208,7 +209,7 @@ quovadis_writewpt(waypoint *wpt) rec->reserved[i] = 0; } - docopy(rec_ptr, (const char*)rec, sizeof(*rec)); + memcpy(rec_ptr, rec, sizeof(*rec)); rec_ptr += sizeof(*rec); rec_index += 1; xfree(rec); -- 2.30.2